Merge fix for Bug#8870 from trunk
authorChong Yidong <cyd@stupidchicken.com>
Mon, 27 Jun 2011 21:17:21 +0000 (17:17 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 27 Jun 2011 21:17:21 +0000 (17:17 -0400)

Trivial merge